Merge version 9.3.0+dfsg1-4+rpi1 and 9.5.2+dfsg2-4 to produce 9.5.2+dfsg2-4+rpi1

diff --cc debian/changelog
index be8a86c220d62d84e72d5a50f1f4f9cf1fe6a4fc,7b49e457800de9bf1d746d706135f8cc4bca93e1..76ca561189a19a3f548b330f992bddb93b18b38b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,71 +1,83 @@@
- vtk9 (9.3.0+dfsg1-4+rpi1) trixie-staging; urgency=medium
++vtk9 (9.5.2+dfsg2-4+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 9.0.1+dfsg1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 05 Jan 2021 14:46:48 +0000]
 +  * Link with libatomic on armhf too for raspbian.
 +
 +  [changes brought forward from 9.3.0+dfsg1-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Sep 2024 16:08:15 +0000]
 +  * Change build-depends to libhdf5-mpi-dev
 +  * Add build-depends on libopenmpi-dev, I'm not sure why this is still
 +    trying to link against openmpi libs but I need it built.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 19 Feb 2025 07:39:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 30 Jan 2026 08:03:46 +0000
++
+ vtk9 (9.5.2+dfsg2-4) unstable; urgency=medium
+ 
+   * Team upload
+   * Enable VTK external rendering with SDL, GLFW, etc.
+ 
+  -- Dominique Belhachemi <domibel@debian.org>  Mon, 27 Oct 2025 14:54:02 -0400
+ 
+ vtk9 (9.5.2+dfsg2-3) unstable; urgency=medium
+ 
+   * Team upload
+   * Fix vtk9-doc FTBFS
+ 
+  -- Dominique Belhachemi <domibel@debian.org>  Thu, 23 Oct 2025 20:23:59 -0400
+ 
+ vtk9 (9.5.2+dfsg2-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Fix manpages suffix
+ 
+  -- Dominique Belhachemi <domibel@debian.org>  Thu, 23 Oct 2025 14:27:19 -0400
+ 
+ vtk9 (9.5.2+dfsg2-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream release 9.5.2+dfsg2
+   * Keep embedded viskores and scn sources
+   * Exclude embedded nlohmannjson/vtknlohmannjson sources
+   * d/copyright: Update files and licenses
+   * Raise minimum Java version from 8 to 11 (javac --release 11)
+   * Add nlohmann-json3-dev dependency
+   * Add PPC64 patch
+   * Lower optimization to -O1 on alpha to fix FTBFS
+   * Bump Standards-Version to 4.7.2
+   * Drop outdated patches
+   * Remove hardcoded compiler flags
+   * Update man pages
+   * Switch to Qt6
+ 
+  -- Dominique Belhachemi <domibel@debian.org>  Mon, 13 Oct 2025 12:11:48 -0400
+ 
+ vtk9 (9.3.0+dfsg1-7) unstable; urgency=medium
+ 
+   * Non-maintainer upload
+   * Remove obsolete libosmesa6-dev dependency. (Closes: #1113920)
+   * Remove obsolete tcl-dev and tk-dev dependency.
+   * Remove r-base dependency
+   * Apply upstream patch to fix gcc-15 FTBFS issue (Closes: #1111572)
+   * Remove obsolete libftgl-dev dependency
+ 
+  -- Dominique Belhachemi <domibel@debian.org>  Thu, 04 Sep 2025 14:06:08 -0400
+ 
+ vtk9 (9.3.0+dfsg1-6) unstable; urgency=medium
+ 
+   * Team upload.
+   * Remove obsolete libmrmpi-dev dependency.
+ 
+  -- Bastian Germann <bage@debian.org>  Mon, 01 Sep 2025 17:22:13 +0200
+ 
+ vtk9 (9.3.0+dfsg1-5) unstable; urgency=medium
+ 
+   * Team upload.
+   [ Adrian Bunk ]
+   * Apply patch from Samuel Thibault to disable Java and TBB on Hurd.
+     Closes: #1094994.
+   * Make TBB architecture settings consistent.
+   * Remove handling of removed kfreebsd.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Fri, 22 Aug 2025 13:20:00 +0200
  
  vtk9 (9.3.0+dfsg1-4) unstable; urgency=medium
  

diff --cc debian/control
index 21d09130190dc0ea4a90ff9a743b0ef96c8fb27e,43c4f29fd59159d6551104138cd201d081877022..a7e41ad75110dc4e2f51aaeeacf1533a2d2a3713
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -78,9 -69,8 +69,9 @@@ Build-Depends: dpkg-dev (>= 1.22.5)
                 xauth,
                 xvfb,
                 zlib1g-dev,
 -               sqlite3
 +               sqlite3,
 +               libopenmpi-dev,
- Standards-Version: 4.6.2
+ Standards-Version: 4.7.2
  Vcs-Browser: https://salsa.debian.org/science-team/vtk9
  Vcs-Git: https://salsa.debian.org/science-team/vtk9.git
  Homepage: https://www.vtk.org/

diff --cc debian/rules
index c6f9d9efe30568626c0e24d0f8ad736847ecaa50,afb10eb0172616b91ae0d7c6b41400f70f23086d..8061716ae877ed2e3a2ef1c9a149e1485a74a8ba
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -3,13 -3,16 +3,16 @@@ BUILDDIR = $(CURDIR)/debian/buil
  
  include /usr/share/dpkg/architecture.mk
  
- nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64
- ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs)))
+ nojava_archs=hppa
+ nojava_os=hurd
+ ifeq (,$(filter $(DEB_BUILD_ARCH), $(nojava_archs))$(filter $(DEB_BUILD_ARCH_OS), $(nojava_os)))
    export JAVA_HOME=/usr/lib/jvm/default-java
    extra_flags += -DVTK_WRAP_JAVA=ON
+   # increase java version from 8 to 11 to remove many warnings
+   extra_flags += -DVTK_JAVA_RELEASE_VERSION:STRING=11
  endif
  
 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4))
 +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mips mipsel powerpc sh4))
    export DEB_CXXFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
    export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
  endif